Merge branch 'deb/emacs23/d/sid/upstream' into deb/emacs23/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Sat, 8 May 2010 03:29:02 +0000 (22:29 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 8 May 2010 03:29:02 +0000 (22:29 -0500)

Trivial merge